Add some strings containing multibyte characters.

2005-09-13  Matthias Clasen  <mclasen@redhat.com>

	* tests/testentrycompletion.c (create_simple_completion_model): Add
	some strings containing multibyte characters.

	* gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix):
	Fix prefix insertion for multibyte characters.  (#316095,
	Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index 8d8b7e5277617177594677cebd56d1aedf178824..9f8906f7fc3a94a3596e491ef8cf0b633650ac88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (create_simple_completion_model): Add
+       some strings containing multibyte characters.
+
+       * gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix): 
+       Fix prefix insertion for multibyte characters.  (#316095,
+       Tommi Komulainen)
+
        * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): 
        * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently
        return NULL if the widget is not realized.  (#316023,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8d8b7e5277617177594677cebd56d1aedf178824..9f8906f7fc3a94a3596e491ef8cf0b633650ac88 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2005-09-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (create_simple_completion_model): Add
+       some strings containing multibyte characters.
+
+       * gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix): 
+       Fix prefix insertion for multibyte characters.  (#316095,
+       Tommi Komulainen)
+
        * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): 
        * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently
        return NULL if the widget is not realized.  (#316023,

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 9b558e8b1b6a5e36645e5dc4cc12bdfe01d0fbd7..2c327153ae8cf5eaa3cab0fe5eb32c1c3e8465c9 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1552,7 +1552,7 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
          gint pos = prefix_len;
 
          gtk_editable_insert_text (GTK_EDITABLE (completion->priv->entry),
-                                   prefix + key_len, -1, &pos);
+                                   prefix + strlen (key), -1, &pos);
          gtk_editable_select_region (GTK_EDITABLE (completion->priv->entry),
                                      key_len, prefix_len);
 

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index b806b016bea2f082b8ebd500680575c4c9d16f47..92f69d432c4a3d3f396bc3c2b947134d91ef73fc 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -111,6 +111,12 @@ create_simple_completion_model (void)
   gtk_list_store_set (store, &iter, 0, "Totipalmi", -1);
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter, 0, "zombie", -1);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "a\303\246x", -1);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "a\303\246y", -1);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "a\303\246z", -1);
  
   return GTK_TREE_MODEL (store);
 }
@@ -314,6 +320,7 @@ main (int argc, char *argv[])
   
   /* Create the completion object */
   completion = gtk_entry_completion_new ();
+  gtk_entry_completion_set_inline_completion (completion, TRUE);
   
   /* Assign the completion to the entry */
   gtk_entry_set_completion (GTK_ENTRY (entry), completion);